Skip to content

Allow other manifests to define ::apache::mod{ 'ssl': }. #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

smerrill
Copy link
Contributor

This will allow Apache from the httpd24 SCL on RHELish systems to include the proper mod_ssl package while still letting SSL-enabled ::apache::vhost defines work as expected.

puppetlabs-apache works quite well with the RHEL/CentOS SCLs, like so:

  softwarecollectionsorg { 'httpd24': }
  class { '::apache':
    service_name   => 'httpd24-httpd',
    apache_version => '2.4',
    mpm_module     => 'event',
    httpd_dir      => '/opt/rh/httpd24/root/etc/httpd',
    vhost_dir      => '/opt/rh/httpd24/root/etc/httpd/conf.d',
    require        => Softwarecollectionsorg['httpd24'],
  }

That said, its mod_ssl package is named httpd24-mod_ssl. This can also be worked around on its own:

  apache::mod { 'ssl':
    package => 'httpd24-mod_ssl',
    require => Softwarecollectionsorg['httpd24'],
  }

When an apache::vhost is instantiated with the SSL parameter set to true, however, it will include ::apache::mod::ssl, which happens to instantiate ::apache::mod { 'ssl': } without any parameters. This PR allows the details of which package to use for ::apache::mod { 'ssl': } to be defined and still allow SSL-enabled ::apache::vhost defines to work.

@underscorgan
Copy link
Contributor

@smerrill I think I'd rather see this fixed by having the package for mod::ssl be configurable by parameter. Are you up for trying that fix?

@puppetcla
Copy link

Waiting for CLA signature by @smerrill

@smerrill - We require a Contributor License Agreement (CLA) for people who contribute to Puppet, but we have an easy click-through license with instructions, which is available at https://cla.puppetlabs.com/

Note: if your contribution is trivial and you think it may be exempt from the CLA, please post a short reply to this comment with details. http://docs.puppetlabs.com/community/trivial_patch_exemption.html

@smerrill
Copy link
Contributor Author

@mhaskel, that sounds like a fine approach. I'll get a patch back soon.

This will allow Apache from the httpd24 SCL on RHELish systems to
include the proper mod_ssl package while still letting ssl
::apache::vhost defines work as expected.

Add package_name param to ::apache::mod::ssl.

Add a test for the package_name parameter.

Update the package_name parameter test.
@puppetcla
Copy link

CLA signed by all contributors.

igalic added a commit that referenced this pull request Aug 18, 2014
…tion

Allow other manifests to define ::apache::mod{ 'ssl': }.
@igalic igalic merged commit b41cbf3 into puppetlabs:master Aug 18, 2014
traylenator pushed a commit to traylenator/puppetlabs-apache that referenced this pull request Jun 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants